Commit the Bushnell reader/writer (but leave it disabled) so others

can help work through the remaining issues.

diff --git a/Makefile.in b/Makefile.in
index 2afcacb5d64a93596965949d5ac417fdec06a413..36d3dae7e484d73d10f204d7c83af50b71ab5d27 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -64,7 +64,7 @@ ALL_FMTS=$(MINIMAL_FMTS) gtm.o gpsutil.o pcx.o cetus.o copilot.o \
        igo8.o gopal.o humminbird.o mapasia.o gnav_trl.o navitel.o ggv_ovl.o \
        jtr.o sbp.o sbn.o mmo.o skyforce.o itracku.o v900.o delbin.o \
        pocketfms_bc.o pocketfms_fp.o pocketfms_wp.o naviguide.o enigma.o \
-       vpl.o teletype.o jogmap.o \
+       vpl.o teletype.o jogmap.o bushnell.o \
 
 FMTS=@FMTS@
 

diff --git a/bushnell.c b/bushnell.c
new file mode 100644 (file)
index 0000000..e20b835
--- /dev/null
+++ b/bushnell.c
@@ -0,0 +1,107 @@
+/*
+    Read and write Bushnellfiles.
+
+    Copyright (C) 2008  Robert Lipe (robertlipe@gpsbabel.org)
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111 USA
+
+ */
+
+
+#include "defs.h"
+#define MYNAME "Bushnell"
+
+static gbfile *file_in;
+static gbfile *file_out;
+
+static
+arglist_t bushnell_args[] = {
+  ARG_TERMINATOR
+};
+
+
+static void
+rd_init(const char *fname) {
+  file_in = gbfopen_le(fname, "rb", MYNAME);
+}
+
+static void
+rd_deinit(void) {
+  gbfclose(file_in);
+}
+
+static void
+wr_init(const char *fname) {
+  file_out = gbfopen_le(fname, "wb", MYNAME);
+}
+
+static void
+wr_deinit(void) {
+  gbfclose(file_out);
+}
+
+/*
+ * Each file contains a single waypoint.
+ */
+static void
+bushnell_read(void) {
+  long lat_tmp,lon_tmp;
+  waypoint *wpt_tmp = waypt_new();
+
+  lat_tmp = gbfgetuint32(file_in);
+  lon_tmp = gbfgetuint32(file_in);
+
+  wpt_tmp->altitude = gbfgetuint16(file_in);
+  wpt_tmp->latitude = lat_tmp / 10000000.0;
+  wpt_tmp->longitude = lon_tmp / 10000000.0;
+
+  // Apparently this is always zero terminated, though it's never been
+  // observed to be longer than 19 bytes + a null terminator.
+  wpt_tmp->shortname = xstrdup(gbfgetstr(file_in));
+
+  waypt_add(wpt_tmp);
+}
+
+static void
+bushnell_write_one(const waypoint *wpt) {
+  char tbuf[22];
+
+  gbfputint32(wpt->latitude  * 10000000, file_out);
+  gbfputint32(wpt->longitude * 10000000, file_out);
+  gbfputuint16(wpt->altitude, file_out);
+
+  strncpy(tbuf, wpt->shortname, sizeof(tbuf));
+  tbuf[sizeof(tbuf)-1] = 0;
+  gbfwrite(tbuf, sizeof(tbuf), 1, file_out);
+}
+
+static void
+bushnell_write(void) {
+  waypt_disp_all(bushnell_write_one);
+}
+
+ff_vecs_t bushnell_vecs = {
+  ff_type_file,
+  FF_CAP_RW_WPT,
+  rd_init,
+  wr_init,
+  rd_deinit,
+  wr_deinit,
+  bushnell_read,
+  bushnell_write,
+  NULL,
+  bushnell_args,
+  CET_CHARSET_MS_ANSI, 0  /* Not really sure... */
+};

diff --git a/vecs.c b/vecs.c
index c4b7a1bf10441703707c4a2fa22f232e08c21294..c260ca5c4c69e9a9c630f2054cca87d5c62198e6 100644 (file)
--- a/vecs.c
+++ b/vecs.c
@@ -159,6 +159,7 @@ extern ff_vecs_t sbp_vecs;
 extern ff_vecs_t ng_vecs;
 extern ff_vecs_t sbn_vecs;
 extern ff_vecs_t mmo_vecs;
+extern ff_vecs_t bushnell_vecs;
 extern ff_vecs_t skyforce_vecs;
 extern ff_vecs_t v900_vecs;
 extern ff_vecs_t pocketfms_bc_vecs;
@@ -912,6 +913,14 @@ vecs_t vec_list[] = {
                 "Memory-Map Navigator overlay files (.mmo)",
                 "mmo"
         },
+#if PLANE
+        {
+                &bushnell_vecs,
+                "bushnell",
+                "Bushnell GPS file",
+                "wpt"
+        },
+#endif
         {
                &skyforce_vecs,
                "skyforce",